Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 23 Oct 2011 16:21:23 +0000 (09:21 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 23 Oct 2011 16:21:23 +0000 (09:21 -0700)
commit3e4f3047c898dd8802501e40bb9fbd16fe276ffe
treec6543834e5c04392e2465cf665c686ae20798e7b
parentde4b58d9a998d926a7ff220e48910156e9af96cc
parent9f685a75be443216f64ae704a75df0dd2650d7df
Merge from trunk.